# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1046.15.63 -> 1.1046.15.64 # drivers/char/mem.c 1.35.1.7 -> 1.35.1.8 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/06/10 perex@suse.cz 1.1046.256.2 # Merge suse.cz:/home/perex/bk/linux-sound/linux-sound # into suse.cz:/home/perex/bk/linux-sound/work # -------------------------------------------- # 03/06/10 rmk@flint.arm.linux.org.uk 1.1046.259.1 # Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5 # into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-serial # -------------------------------------------- # 03/06/10 stevef@steveft21.ltcsamba 1.1046.188.2 # Do not generate warning on ro (read only) cifs mount option # -------------------------------------------- # 03/06/10 anton@samba.org 1.1046.138.79 # Merge samba.org:/scratch/anton/linux-2.5 # into samba.org:/scratch/anton/tmp3 # -------------------------------------------- # 03/06/10 perex@suse.cz 1.1046.256.3 # ALSA micro update - fixed compilation of VXPocket drivers (missing symbols) # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.6 # [lapic] Convert to new system device API. # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.7 # [i8259] Convert to use new system device API. # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.8 # [nmi] Convert to use new system device API. # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.9 # [timer] Convert to use new system device API. # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.10 # [oprofile] Convert to use new system device API. # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.11 # [x86-64 i8259] Convert to use new system device API. # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.12 # [s390 xpram] Convert to use new system device API. # -------------------------------------------- # 03/06/10 greg@kroah.com 1.1046.252.78 # [PATCH] PCI: add pci_find_next_bus() function to prevent people from walking pci bus lists themselves. # -------------------------------------------- # 03/06/10 greg@kroah.com 1.1046.252.79 # [PATCH] PCI: remove pci_for_each_bus() usage from arch/ia64/hp/common/sba_iommu.c # -------------------------------------------- # 03/06/10 greg@kroah.com 1.1046.252.80 # [PATCH] PCI: remove pci_for_each_bus() usage from drivers/pci/pci.c # -------------------------------------------- # 03/06/10 greg@kroah.com 1.1046.252.81 # [PATCH] PCI: remove pci_for_each_bus() macro as there are now no more users of it. # -------------------------------------------- # 03/06/10 trini@kernel.crashing.org 1.1046.260.1 # PPC32: Update the OpenPIC code. # This is related to bugzilla bug #791 # -------------------------------------------- # 03/06/10 david-b@pacbell.net 1.1046.252.82 # [PATCH] PCI: pci pool, poison more like slab code # # This adds a new poisoning mode, distinguishing memory # that's uninitialized from memory that's freed. The # slab code has been doing this for a while now. # -------------------------------------------- # 03/06/10 greg@kroah.com 1.1046.252.83 # [PATCH] PCI: remove pci_bus_b() call in arch/i386/pci/common.c # -------------------------------------------- # 03/06/10 greg@kroah.com 1.1046.252.84 # [PATCH] PCI: remove some pci_bus_b() calls in drivers/pci/power.c # -------------------------------------------- # 03/06/10 greg@kroah.com 1.1046.252.85 # Merge kroah.com:/home/greg/linux/BK/bleed-2.5 # into kroah.com:/home/greg/linux/BK/pci-2.5 # -------------------------------------------- # 03/06/10 cifs.adm@hostme.bitkeeper.com 1.1046.261.1 # Merge bk://linux.bkbits.net/linux-2.5 # into hostme.bitkeeper.com:/ua/repos/c/cifs/linux-2.5cifs # -------------------------------------------- # 03/06/10 torvalds@home.transmeta.com 1.1046.252.86 # Merge http://linux-sound.bkbits.net/linux-sound # into home.transmeta.com:/home/torvalds/v2.5/linux # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.13 # [driver model] Create include/linux/sysdev.h and define sysdev_attribute. # # Split out all system device definitions from device.h into their own header # sysdev.h # # Define struct sysdev_attribute and define functions to export attributes # in sysfs. # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.14 # [driver model] Make sure right header is used for cpu.c # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.15 # [memblk] Convert to use new system device API # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.16 # [numa nodes] Convert to use new system device API # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.17 # [driver model] Remove system device definitions from device.h # # Should have been in earlier changeset. D'oh. # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.18 # [apic] Use sysdev.h instead of device.h # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.19 # [i8259] Use sysdev.h instead of device.h # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.20 # [nmi] Use sysdev.h instead of device.h # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.21 # [timer] Use sysdev.h instead of device.h # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.22 # [oprofile] Use sysdev.h instead of device.h # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.23 # [x86-64 i8259] Use sysdev.h instead of device.h # -------------------------------------------- # 03/06/10 mochel@osdl.org 1.1046.255.24 # [s390 xpram] Use sysdev.h instead of device.h # -------------------------------------------- # 03/06/10 davidm@tiger.hpl.hp.com 1.1046.15.64 # Adjust for force_successful_syscall_return() having moved back to # ptrace.h. # -------------------------------------------- # diff -Nru a/drivers/char/mem.c b/drivers/char/mem.c --- a/drivers/char/mem.c Mon Sep 22 13:00:35 2003 +++ b/drivers/char/mem.c Mon Sep 22 13:00:35 2003 @@ -25,7 +25,6 @@ #include #include -#include #include #include